From 542ac19eef22cfeacf1c5363ce061ac2f9854f61 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Tue, 27 Jun 2006 09:28:48 +0000 Subject: [PATCH] cancel the expand collapse timeout when unsetting the model (Fixes 2006-06-27 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_set_model): cancel the expand collapse timeout when unsetting the model (Fixes #327164, reported by Daichi Kawahata). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtktreeview.c | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index c3f6448021..de5864d4d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-06-27 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_set_model): cancel the + expand collapse timeout when unsetting the model (Fixes #327164, + reported by Daichi Kawahata). + 2006-06-26 Michael Emmel * gdk/directfb/gdkdirectfb.h: added ifdef to compile with directfb 0.9.24 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c3f6448021..de5864d4d4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-06-27 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_set_model): cancel the + expand collapse timeout when unsetting the model (Fixes #327164, + reported by Daichi Kawahata). + 2006-06-26 Michael Emmel * gdk/directfb/gdkdirectfb.h: added ifdef to compile with directfb 0.9.24 diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index cf4be7fce0..c8c3e49a37 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -10399,6 +10399,12 @@ gtk_tree_view_set_model (GtkTreeView *tree_view, gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree); gtk_tree_view_stop_editing (tree_view, TRUE); + if (tree_view->priv->expand_collapse_timeout) + { + g_source_remove (tree_view->priv->expand_collapse_timeout); + tree_view->priv->expand_collapse_timeout = 0; + } + g_signal_handlers_disconnect_by_func (tree_view->priv->model, gtk_tree_view_row_changed, tree_view); -- 2.30.2